From 21688697539e2de643cd8071291e85f2fe505cac Mon Sep 17 00:00:00 2001
From: Alex Williamson <alex.williamson@hp.com>
Date: Fri, 14 Dec 2007 13:49:04 -0700
Subject: [PATCH] [IA64] Move PERFC() from asmmacro.h

Signed-off-by: Akio Takebe <takebe_akio@jp.fujitsu.com>
---
 xen/arch/ia64/xen/hyperprivop.S               | 3 +++
 xen/include/asm-ia64/linux-xen/asm/asmmacro.h | 4 ----
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/xen/arch/ia64/xen/hyperprivop.S b/xen/arch/ia64/xen/hyperprivop.S
index 5c2ba5a528..dd8aba6627 100644
--- a/xen/arch/ia64/xen/hyperprivop.S
+++ b/xen/arch/ia64/xen/hyperprivop.S
@@ -18,6 +18,9 @@
 #include <asm/vmmu.h>
 #include <public/xen.h>
 
+#ifdef PERF_COUNTERS
+#define PERFC(n) (THIS_CPU(perfcounters) + (IA64_PERFC_ ## n) * 4)
+#endif
 
 #define PAGE_PHYS	(__DIRTY_BITS | _PAGE_PL_PRIV | _PAGE_AR_RWX)
 
diff --git a/xen/include/asm-ia64/linux-xen/asm/asmmacro.h b/xen/include/asm-ia64/linux-xen/asm/asmmacro.h
index 73c51e2bc4..77af457f4a 100644
--- a/xen/include/asm-ia64/linux-xen/asm/asmmacro.h
+++ b/xen/include/asm-ia64/linux-xen/asm/asmmacro.h
@@ -108,8 +108,4 @@ name:
 # define dv_serialize_instruction
 #endif
 
-#ifdef PERF_COUNTERS
-#define PERFC(n) (THIS_CPU(perfcounters) + (IA64_PERFC_ ## n) * 4)
-#endif
-
 #endif /* _ASM_IA64_ASMMACRO_H */
-- 
2.30.2